Merge develop into kv-database #8992

arhag · 2020-04-23T03:21:01Z

Change Description

This PR merges the develop branch (with the new host function system introduced in PR #8868) into kv-database.

It ports all of the intrinsics introduced in PR #8223 to the new host function system.

The new host function system revealed that the test wast code in the kv_tests/notify unit test was aliasing the key and value spans in calls to the kv_set intrinsic. The test wast code has been modified to avoid aliasing.

This PR also includes fixes to a couple of additional bugs that were introduced in PR #8868 (one in webassembly/preconditions.hpp and one in webassembly/common.hpp):

diff --git a/libraries/chain/include/eosio/chain/webassembly/preconditions.hpp b/libraries/chain/include/eosio/chain/webassembly/preconditions.hpp
index 42eb44ba5..75564b468 100644
--- a/libraries/chain/include/eosio/chain/webassembly/preconditions.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/preconditions.hpp
@@ -127,7 +127,7 @@ namespace eosio { namespace chain { namespace webassembly {
             }
             if constexpr (is_span_type_v<arg_t> || vm::is_argument_proxy_type_v<arg_t>) {
                eosio::vm::invoke_on<false, eosio::vm::invoke_on_all_t>([&](auto&& narg, auto&&... nrest) {
-                  using nested_arg_t = std::decay_t<decltype(arg)>;
+                  using nested_arg_t = std::decay_t<decltype(narg)>;
                   if constexpr (eosio::vm::is_span_type_v<nested_arg_t> || vm::is_argument_proxy_type_v<arg_t>)
                       EOS_ASSERT(!is_aliasing(detail::to_span(arg), detail::to_span(narg)), wasm_exception, "pointers not allowed to alias");
                }, rest...);

diff --git a/libraries/chain/include/eosio/chain/webassembly/common.hpp b/libraries/chain/include/eosio/chain/webassembly/common.hpp
index 14fa9bbed..393fd385a 100644
--- a/libraries/chain/include/eosio/chain/webassembly/common.hpp
+++ b/libraries/chain/include/eosio/chain/webassembly/common.hpp
@@ -74,7 +74,7 @@ namespace eosio { namespace chain {
       template <typename T>
       auto from_wasm(void* ptr) const
          -> std::enable_if_t< std::is_pointer_v<T>,
-                              vm::argument_proxy<std::remove_pointer_t<T>>> {
+                              vm::argument_proxy<T> > {
          validate_pointer<std::remove_pointer_t<T>>(ptr, 1);
          return {ptr};
       }

I recommend using the following diff to review the relevant changes (excluding the parts that just bring in code changes that were already merged into develop).

Consensus Changes

Consensus Changes

API Changes

API Changes

Documentation Additions

Documentation Additions

…r, WABT removal and OC disable

Add nodeos RPC API index, improve nodeos implementation doc, fix link

…s. They are no longer necessary.

Feature/new host function system

Avoid legacy for set_action_return_value intrinsic

Avoid aliasing the key and value spans within the kv_set intrinsic calls made in test contracts used for the `kv_tests/notify` unit tests.

swatanabe-b1 · 2020-04-23T15:07:46Z

unittests/kv_tests.cpp

@@ -766,7 +766,7 @@ static const char kv_notify_wast[] = R"=====(
  (drop (call $kv_it_create (get_local 2) (get_local 0) (i32.const 0) (i32.const 0)))
  (drop (call $kv_it_create (get_local 2) (get_local 0) (i32.const 0) (i32.const 0)))
  (call $kv_it_destroy (i32.const 2))
-  (drop (call $kv_set (get_local 2) (get_local 0) (i32.const 0) (i32.const 0) (i32.const 0) (i32.const 1)))
+  (drop (call $kv_set (get_local 2) (get_local 0) (i32.const 0) (i32.const 0) (i32.const 1) (i32.const 1)))


The alias check is asymmetric. These should not be considered to alias.

Will handle this in kv-database.

ndcgundlach and others added 30 commits January 6, 2020 15:03

fixes to chain library for reflection

399fbd8

validation script fixes

038dd7b

updated regex

d1cbb3b

took out ignore

6836cf4

updated regex to account for class enums

78f71fb

fixed derived type reflection

76d89c4

updated regex to handle using namespace

5c204e6

took out debug statements

ee54828

Merge branch 'develop' into issue_7762_ref_fixes

900d35c

removed leftover debugging code

0609857

updated reflection field pattern to trim leading and trailing spaces

4d6e9a6

undid formatting changes given new reflection script capabilities

aaf71db

added correct ignores

583ab03

updated regex for reflection to not ignore last statement

d6c719e

minor reflection fixes based on output from validation script

9126f21

minor reflection changes based on output of validation script

abea85f

updated ignores

902e198

added support for typedefs

1d4fddd

reflection fixes

58ddead

c++ parsing fixes

f7c85fc

Update eos-vm.

c69d37d

updates to class/struct regex

335e3d2

added fix for template fields

393fa01

New host function system, precondition system, wasm_interface refacto…

cffdf09

…r, WABT removal and OC disable

wip22

3eff5d1

remove old pieces

c4f9e1c

more changes, still compilation failures

e72b773

updated host functions

7a50243

finishing up

c74ed9e

promote some host functions from legacy to new

ff0250b

swatanabe-b1 and others added 25 commits April 21, 2020 16:36

Update to match changes in reference_proxy.

be53680

Rename legacy_array_ptr to legacy_span

d453634

Remove unnecessary overload of from_wasm

3b19d3b

Use legacy_span<const char> wherever possible.

55dfd7b

Fix read_action_data.

5a0d052

Use get_original_pointer() instead of direct access to original_ptr.

ad7249f

Make the memory api return void* instead of char*

5b1c328

Make some members const

7e09dd1

Merge pull request #8979 from EOSIO/fix-8973-8978

164a889

Add nodeos RPC API index, improve nodeos implementation doc, fix link

Remove overloads of from_wasm that were duplicated from the base clas…

170eaeb

…s. They are no longer necessary.

Only allow span<[const] char>

b5d46b9

Remove unused constant

d751747

Merge non-legacy preconditions into core_precondition

847d231

Remove out-dated comment

3b6c3d7

Simplify conditions

ba81863

Use string_view

599b2c2

Make apply_context::require_authorization const.

df94c5c

Fix #undefs.

87818c7

One more #undef

e82fb96

Update eos-vm

1d5d06d

Merge pull request #8868 from EOSIO/feature/new_host_function_system

ed3effd

Feature/new host function system

set_action_return_value does not need to be legacy

d6bd15c

Merge pull request #8991 from EOSIO/set_action_return_value-not-legacy

df4af44

Avoid legacy for set_action_return_value intrinsic

Merge branch 'develop' into kv-database

94582f6

avoid aliasing in kv_tests/notify

6fa433f

Avoid aliasing the key and value spans within the kv_set intrinsic calls made in test contracts used for the `kv_tests/notify` unit tests.

arhag requested a review from swatanabe-b1 April 23, 2020 03:21

swatanabe-b1 suggested changes Apr 23, 2020

View reviewed changes

swatanabe-b1 approved these changes Apr 23, 2020

View reviewed changes

arhag merged commit 48e51f8 into kv-database Apr 23, 2020

arhag deleted the kv-database-merge branch April 23, 2020 15:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge develop into kv-database #8992

Merge develop into kv-database #8992

arhag commented Apr 23, 2020 •

edited

Loading

swatanabe-b1 Apr 23, 2020

swatanabe-b1 Apr 23, 2020

Merge develop into kv-database #8992

Merge develop into kv-database #8992

Conversation

arhag commented Apr 23, 2020 • edited Loading

Change Description

Consensus Changes

API Changes

Documentation Additions

swatanabe-b1 Apr 23, 2020

Choose a reason for hiding this comment

swatanabe-b1 Apr 23, 2020

Choose a reason for hiding this comment

arhag commented Apr 23, 2020 •

edited

Loading